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

1

Browse Source
This commit is contained in:
罗松柏 2021-11-22 19:40:30 +08:00
parent 4ed7104d01
commit 2d2b6d263d
6 changed files with 167 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
web/pages/analysis.html
View File

@ -282,8 +282,8 @@
<div class="analysis-zhibiao-list-type3 analysis-background analysis-choicetypename" data-index="{{index}}" data-indexs="{{indexs}}" data-type="{{items.data_type}}">{{items.comparator_name}}</div> <div class="analysis-zhibiao-list-type3 analysis-background analysis-choicetypename" data-index="{{index}}" data-indexs="{{indexs}}" data-type="{{items.data_type}}">{{items.comparator_name}}</div>
<!-- {{# if(item.comparator_id != "is null" && item.comparator_id != "is not null" && item.comparator_id !="not null" && item.comparator_id != "range"){ }} --> <!-- {{# if(item.comparator_id != "is null" && item.comparator_id != "is not null" && item.comparator_id !="not null" && item.comparator_id != "range"){ }} -->
{{# if(items.tableType != "user_label"){ }} {{# if(items.tableType != "user_label"){ }}
<div class="analysis-zhibiao-list-type4" id="analysis-zhibiao-list-type4-{{index}}-{{indexs}}" data-index="{{index}}" data-indexs="{{indexs}}"> <div class="analysis-zhibiao-list-type4" id="analysis-zhibiao-list-type4-{{index}}-{{indexs}}" data-index="{{index}}" data-indexs="{{indexs}}" data-comparator="{{item.comparator}}">
<input type="text" data-index="{{index}}" data-indexs="{{indexs}}" placeholder="多个条件用,隔开" value="{{items.strftv}}" autocomplete="off"> <input type="text" data-index="{{index}}" data-indexs="{{indexs}}" placeholder="多个条件用,隔开" value="{{items.strftv}}" autocomplete="off" data-comparator="{{item.comparator}}">
</div> </div>
{{# } }} {{# } }}
<!-- {{# } }} --> <!-- {{# } }} -->
@ -339,7 +339,7 @@
<div id="ta-property-select-{{index}}-{{indexs}}" class="ta-property-select analysis-zhibiao-list-type1 analysis-background" data-index="{{index}}" data-indexs="{{indexs}}"> {{items.columnDesc}}</div> <div id="ta-property-select-{{index}}-{{indexs}}" class="ta-property-select analysis-zhibiao-list-type1 analysis-background" data-index="{{index}}" data-indexs="{{indexs}}"> {{items.columnDesc}}</div>
<div class="analysis-zhibiao-list-type3 analysis-background analysis-choicetypename" data-index="{{index}}" data-indexs="{{indexs}}">{{items.comparator_name}}</div> <div class="analysis-zhibiao-list-type3 analysis-background analysis-choicetypename" data-index="{{index}}" data-indexs="{{indexs}}">{{items.comparator_name}}</div>
<!-- {{# if(item.comparator_id != "is null" && item.comparator_id != "is not null" && item.comparator_id !="not null" && item.comparator_id != "range"){ }} --> <!-- {{# if(item.comparator_id != "is null" && item.comparator_id != "is not null" && item.comparator_id !="not null" && item.comparator_id != "range"){ }} -->
<div class="analysis-zhibiao-list-type4" id="analysis-zhibiao-list-type4-{{index}}-{{indexs}}" data-index="{{index}}" data-indexs="{{indexs}}"> <input type="text" data-index="{{index}}" data-indexs="{{indexs}}" placeholder="多个条件用,隔开" value="{{items.strftv}}"> </div> <div class="analysis-zhibiao-list-type4" id="analysis-zhibiao-list-type4-{{index}}-{{indexs}}" data-index="{{index}}" data-indexs="{{indexs}}" data-comparator="{{item.comparator}}"> <input type="text" data-index="{{index}}" data-indexs="{{indexs}}" placeholder="多个条件用,隔开" value="{{items.strftv}}" data-comparator="{{item.comparator}}"> </div>
<!-- {{# } }} --> <!-- {{# } }} -->
<div class="analysis-zhibiao-list-del" data-index="{{index}}" data-twonum="{{indexs}}"></div> <div class="analysis-zhibiao-list-del" data-index="{{index}}" data-twonum="{{indexs}}"></div>
</div> </div>
@ -420,13 +420,13 @@
{{# if(item.comparator_id != "is null" && item.comparator_id != "is not null" && item.comparator_id !="not null" && item.comparator_id != "range"){ }} {{# if(item.comparator_id != "is null" && item.comparator_id != "is not null" && item.comparator_id !="not null" && item.comparator_id != "range"){ }}
<!-- <div class="analysis-overall-situation-input" > <input type="text" data-index="{{index}}" placeholder="多个用,隔开" value="{{item.strftv}}" /> </div> --> <!-- <div class="analysis-overall-situation-input" > <input type="text" data-index="{{index}}" placeholder="多个用,隔开" value="{{item.strftv}}" /> </div> -->
{{# if(item.data_type != "datetime" && item.data_type != "user_label"){ }} {{# if(item.data_type != "datetime" && item.data_type != "user_label"){ }}
<div class="analysis-overall-situation-input" data-type="{{item.data_type}}" data-index="{{index}}"> <div class="analysis-overall-situation-input" data-type="{{item.data_type}}" data-index="{{index}}" data-comparator="{{item.comparator}}">
<input type="text" data-index="{{index}}" placeholder="多个用,隔开" value="{{item.strftv}}" data-type="{{item.data_type}}" autocomplete="off"/> <input type="text" data-index="{{index}}" placeholder="多个用,隔开" value="{{item.strftv}}" data-type="{{item.data_type}}" autocomplete="off" data-comparator="{{item.comparator}}"/>
</div> </div>
{{# } else if(item.data_type == "user_label"){ }} {{# } else if(item.data_type == "user_label"){ }}
{{# } else { }} {{# } else { }}
<div class="analysis-overall-situation-date" id="analysis-overall-situation-date{{index}}" data-type="{{item.data_type}}" data-index="{{index}}"> <div class="analysis-overall-situation-date" id="analysis-overall-situation-date{{index}}" data-type="{{item.data_type}}" data-index="{{index}}" data-comparator="{{item.comparator}}">
{{item.ftv}} {{item.ftv}}
</div> </div>
{{# } }} {{# } }}

2
web/pages/screen.html
View File

@ -40,7 +40,7 @@
</div> </div>
{{# if(item.comparator != "is null" && item.comparator != "is not null" && item.comparator !="not null" && item.comparator != "range"){ }} {{# if(item.comparator != "is null" && item.comparator != "is not null" && item.comparator !="not null" && item.comparator != "range"){ }}
{{# if(item.data_type != "datetime"){ }} {{# if(item.data_type != "datetime"){ }}
<div class="right-box" data-type="{{item.data_type}}" data-index="{{index}}"> <div class="right-box" data-type="{{item.data_type}}" data-index="{{index}}" data-comparator="{{item.comparator}}">
<input type="type" class="screen-right-txt" data-index={{index}} placeholder="多个用,隔开" value="{{item.strftv}}" autocomplete="off"> <input type="type" class="screen-right-txt" data-index={{index}} placeholder="多个用,隔开" value="{{item.strftv}}" autocomplete="off">
</div> </div>
{{# } else { }} {{# } else { }}

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

@ -3778,6 +3778,7 @@ var X = window.X || {
var offset = obj.offset(); var offset = obj.offset();
var index = $(this).attr("data-index"); var index = $(this).attr("data-index");
var indexs = $(this).attr("data-indexs"); var indexs = $(this).attr("data-indexs");
var comparator = obj.attr("data-comparator");
var columnName; var columnName;
if(indexs != undefined){ if(indexs != undefined){
columnName = data['events'][index]['filts'][indexs]['columnName']; columnName = data['events'][index]['filts'][indexs]['columnName'];
@ -4185,21 +4186,32 @@ var X = window.X || {
}); });
$(document).off("click",".analysis-overall-situation-input").on("click",".analysis-overall-situation-input",function(){ $(document).off("click",".analysis-overall-situation-input").on("click",".analysis-overall-situation-input",function(event){
var obj = $(this); var obj = $(this);
var offset = obj.offset(); var offset = obj.offset();
var index = $(this).attr("data-index"); var index = $(this).attr("data-index");
var columnName = data['eventView']['filts'][index]['columnName'] var comparator = obj.attr("data-comparator");
var columnName = data['eventView']['filts'][index]['columnName'];
X.api("data_mana/select_attr","post",{attr_name:columnName},function(val){ X.api("data_mana/select_attr","post",{attr_name:columnName},function(val){
console.log(val);
if(val != "查无数据"){ if(val != "查无数据"){
X.parametersopen(val['map_'],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){ X.parametersopen(val['map_'],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
if(comparator == "in"){
if(data['eventView']['filts'][index]['strftv'] == "" ){
var strftv = val.title;
data['eventView']['filts'][index]['ftv'].push(val.id);
}else {
var strftv = data['eventView']['filts'][index]['strftv'] + "," + val.title;
data['eventView']['filts'][index]['ftv'].push(val.id);
}
data['eventView']['filts'][index]['strftv'] = strftv;
}else {
data['eventView']['filts'][index]['strftv'] = val.title; data['eventView']['filts'][index]['strftv'] = val.title;
var arr = []; var arr = [];
arr.push(val.id); arr.push(val.id);
data['eventView']['filts'][index]['ftv'] = arr; data['eventView']['filts'][index]['ftv'] = arr;
}
X.laytpldata("#analysis-overall-situation-list-box-dot",data['eventView']['filts'],".analysis-overall-situation-list-box",function(){ X.laytpldata("#analysis-overall-situation-list-box-dot",data['eventView']['filts'],".analysis-overall-situation-list-box",function(){
renderdate(); renderdate();
}); });
@ -4209,12 +4221,17 @@ var X = window.X || {
}) })
}); });
$(document).off('blur','.analysis-overall-situation-input input').on('blur','.analysis-overall-situation-input input',function(){ $(document).off('blur','.analysis-overall-situation-input input').on('blur','.analysis-overall-situation-input input',function(event){
var index = $(this).attr("data-index"); var index = $(this).attr("data-index");
var comparator = $(this).attr("data-comparator");
if(comparator != 'in'){
var val = $(this).val(); var val = $(this).val();
if(val != ""){
var valarr = val.split(","); var valarr = val.split(",");
data['eventView']['filts'][index]['ftv']=valarr; data['eventView']['filts'][index]['ftv']=valarr;
data['eventView']['filts'][index]['strftv']=val; data['eventView']['filts'][index]['strftv']=val;
}
}
}); });
$(document).off('blur','.analysis-overall-situation-input2 input').on('blur','.analysis-overall-situation-input2 input',function(){ $(document).off('blur','.analysis-overall-situation-input2 input').on('blur','.analysis-overall-situation-input2 input',function(){
@ -10309,7 +10326,6 @@ var X = window.X || {
this.callback = parms.callback; this.callback = parms.callback;
var data = parms; var data = parms;
X.laytpldata("#kanban-model-modify-table-dot",data,"model"+data.id,function(html){ X.laytpldata("#kanban-model-modify-table-dot",data,"model"+data.id,function(html){
$("#conent-box"+data.id).html(html);
// if(data.modeltype == 'table' && data.modelsize != "small"){ // if(data.modeltype == 'table' && data.modelsize != "small"){
@ -10323,11 +10339,7 @@ var X = window.X || {
// } // }
// newcondata.push(condataArr); // newcondata.push(condataArr);
// } // }
// }else if(data.cat == "retention" || data.cat == "scatter"){
// console.log(oldcondata);
// }else if(data.cat == "user_property"){
// }
// var headdata = []; // var headdata = [];
// for(let i in data.titledata){ // for(let i in data.titledata){
// var arr = { // var arr = {
@ -10347,7 +10359,17 @@ var X = window.X || {
// items: newcondata, // items: newcondata,
// fullWidthRows: true // fullWidthRows: true
// }); // });
// // X.fixedTable("table-tbody-box-"+data.id,'row-col-fixed','',headdata,data.condata,data.cat); // X.fixedTable("table-tbody-box-"+data.id,'row-col-fixed','',headdata,data.condata,data.cat);
// }
// // else if(data.cat == "retention" || data.cat == "scatter"){
// // console.log(oldcondata);
// // }else if(data.cat == "user_property"){
// // }
// }else {
$("#conent-box"+data.id).html(html);
// } // }
}) })
@ -12981,6 +13003,7 @@ var X = window.X || {
var type =obj.attr('data-type'); var type =obj.attr('data-type');
X.parametersopen(filter_map[type],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){ X.parametersopen(filter_map[type],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
// console.log(val);
obj.html(val.title); obj.html(val.title);
data['filts'][index]['comparator_name'] = val.title; data['filts'][index]['comparator_name'] = val.title;
data['filts'][index]['comparator'] = val.id; data['filts'][index]['comparator'] = val.id;
@ -12996,15 +13019,31 @@ var X = window.X || {
$(document).off("click",'.right-box').on("click",'.right-box',function(){ $(document).off("click",'.right-box').on("click",'.right-box',function(){
var obj = $(this); var obj = $(this);
var index = obj.attr("data-index"); var index = obj.attr("data-index");
var comparator = obj.attr("data-comparator");
var offset = obj.offset(); var offset = obj.offset();
var columnName = data['filts'][index]['columnName']; var columnName = data['filts'][index]['columnName'];
X.api("data_mana/select_attr","post",{attr_name:columnName},function(val){ X.api("data_mana/select_attr","post",{attr_name:columnName},function(val){
if(val != "查无数据"){ if(val != "查无数据"){
X.parametersopen(val['map_'],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){ X.parametersopen(val['map_'],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
if(comparator == "in"){
if(data['filts'][index]['strftv'] == "" ){
var strftv = val.title;
var ftv = val.id;
}else {
var strftv = data['filts'][index]['strftv'] + "," + val.title;
var ftv = data['filts'][index]['ftv'] + "," + val.id;
}
data['filts'][index]['strftv'] = strftv;
var valarr = ftv.split(",");
data['filts'][index]['ftv']=valarr;
}else {
data['filts'][index]['strftv'] = val.title; data['filts'][index]['strftv'] = val.title;
var arr = []; var arr = [];
arr.push(val.id); arr.push(val.id);
data['filts'][index]['ftv'] = arr; data['filts'][index]['ftv'] = arr;
}
X.laytpldata("#screen-con-box-dot",data['filts'],".screen-con-box",function(){ X.laytpldata("#screen-con-box-dot",data['filts'],".screen-con-box",function(){
renderdate(); renderdate();
}); });

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

@ -391,6 +391,7 @@
var offset = obj.offset(); var offset = obj.offset();
var index = $(this).attr("data-index"); var index = $(this).attr("data-index");
var indexs = $(this).attr("data-indexs"); var indexs = $(this).attr("data-indexs");
var comparator = obj.attr("data-comparator");
var columnName; var columnName;
if(indexs != undefined){ if(indexs != undefined){
columnName = data['events'][index]['filts'][indexs]['columnName']; columnName = data['events'][index]['filts'][indexs]['columnName'];
@ -798,21 +799,32 @@
}); });
$(document).off("click",".analysis-overall-situation-input").on("click",".analysis-overall-situation-input",function(){ $(document).off("click",".analysis-overall-situation-input").on("click",".analysis-overall-situation-input",function(event){
var obj = $(this); var obj = $(this);
var offset = obj.offset(); var offset = obj.offset();
var index = $(this).attr("data-index"); var index = $(this).attr("data-index");
var columnName = data['eventView']['filts'][index]['columnName'] var comparator = obj.attr("data-comparator");
var columnName = data['eventView']['filts'][index]['columnName'];
X.api("data_mana/select_attr","post",{attr_name:columnName},function(val){ X.api("data_mana/select_attr","post",{attr_name:columnName},function(val){
console.log(val);
if(val != "查无数据"){ if(val != "查无数据"){
X.parametersopen(val['map_'],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){ X.parametersopen(val['map_'],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
if(comparator == "in"){
if(data['eventView']['filts'][index]['strftv'] == "" ){
var strftv = val.title;
data['eventView']['filts'][index]['ftv'].push(val.id);
}else {
var strftv = data['eventView']['filts'][index]['strftv'] + "," + val.title;
data['eventView']['filts'][index]['ftv'].push(val.id);
}
data['eventView']['filts'][index]['strftv'] = strftv;
}else {
data['eventView']['filts'][index]['strftv'] = val.title; data['eventView']['filts'][index]['strftv'] = val.title;
var arr = []; var arr = [];
arr.push(val.id); arr.push(val.id);
data['eventView']['filts'][index]['ftv'] = arr; data['eventView']['filts'][index]['ftv'] = arr;
}
X.laytpldata("#analysis-overall-situation-list-box-dot",data['eventView']['filts'],".analysis-overall-situation-list-box",function(){ X.laytpldata("#analysis-overall-situation-list-box-dot",data['eventView']['filts'],".analysis-overall-situation-list-box",function(){
renderdate(); renderdate();
}); });
@ -822,12 +834,17 @@
}) })
}); });
$(document).off('blur','.analysis-overall-situation-input input').on('blur','.analysis-overall-situation-input input',function(){ $(document).off('blur','.analysis-overall-situation-input input').on('blur','.analysis-overall-situation-input input',function(event){
var index = $(this).attr("data-index"); var index = $(this).attr("data-index");
var comparator = $(this).attr("data-comparator");
if(comparator != 'in'){
var val = $(this).val(); var val = $(this).val();
if(val != ""){
var valarr = val.split(","); var valarr = val.split(",");
data['eventView']['filts'][index]['ftv']=valarr; data['eventView']['filts'][index]['ftv']=valarr;
data['eventView']['filts'][index]['strftv']=val; data['eventView']['filts'][index]['strftv']=val;
}
}
}); });
$(document).off('blur','.analysis-overall-situation-input2 input').on('blur','.analysis-overall-situation-input2 input',function(){ $(document).off('blur','.analysis-overall-situation-input2 input').on('blur','.analysis-overall-situation-input2 input',function(){

17
web/srczip/logic/modeltable.js
View File

@ -6,7 +6,6 @@
this.callback = parms.callback; this.callback = parms.callback;
var data = parms; var data = parms;
X.laytpldata("#kanban-model-modify-table-dot",data,"model"+data.id,function(html){ X.laytpldata("#kanban-model-modify-table-dot",data,"model"+data.id,function(html){
$("#conent-box"+data.id).html(html);
// if(data.modeltype == 'table' && data.modelsize != "small"){ // if(data.modeltype == 'table' && data.modelsize != "small"){
@ -20,11 +19,7 @@
// } // }
// newcondata.push(condataArr); // newcondata.push(condataArr);
// } // }
// }else if(data.cat == "retention" || data.cat == "scatter"){
// console.log(oldcondata);
// }else if(data.cat == "user_property"){
// }
// var headdata = []; // var headdata = [];
// for(let i in data.titledata){ // for(let i in data.titledata){
// var arr = { // var arr = {
@ -44,7 +39,17 @@
// items: newcondata, // items: newcondata,
// fullWidthRows: true // fullWidthRows: true
// }); // });
// // X.fixedTable("table-tbody-box-"+data.id,'row-col-fixed','',headdata,data.condata,data.cat); // X.fixedTable("table-tbody-box-"+data.id,'row-col-fixed','',headdata,data.condata,data.cat);
// }
// // else if(data.cat == "retention" || data.cat == "scatter"){
// // console.log(oldcondata);
// // }else if(data.cat == "user_property"){
// // }
// }else {
$("#conent-box"+data.id).html(html);
// } // }
}) })

17
web/srczip/logic/screen.js
View File

@ -135,6 +135,7 @@
var type =obj.attr('data-type'); var type =obj.attr('data-type');
X.parametersopen(filter_map[type],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){ X.parametersopen(filter_map[type],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
// console.log(val);
obj.html(val.title); obj.html(val.title);
data['filts'][index]['comparator_name'] = val.title; data['filts'][index]['comparator_name'] = val.title;
data['filts'][index]['comparator'] = val.id; data['filts'][index]['comparator'] = val.id;
@ -150,15 +151,31 @@
$(document).off("click",'.right-box').on("click",'.right-box',function(){ $(document).off("click",'.right-box').on("click",'.right-box',function(){
var obj = $(this); var obj = $(this);
var index = obj.attr("data-index"); var index = obj.attr("data-index");
var comparator = obj.attr("data-comparator");
var offset = obj.offset(); var offset = obj.offset();
var columnName = data['filts'][index]['columnName']; var columnName = data['filts'][index]['columnName'];
X.api("data_mana/select_attr","post",{attr_name:columnName},function(val){ X.api("data_mana/select_attr","post",{attr_name:columnName},function(val){
if(val != "查无数据"){ if(val != "查无数据"){
X.parametersopen(val['map_'],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){ X.parametersopen(val['map_'],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
if(comparator == "in"){
if(data['filts'][index]['strftv'] == "" ){
var strftv = val.title;
var ftv = val.id;
}else {
var strftv = data['filts'][index]['strftv'] + "," + val.title;
var ftv = data['filts'][index]['ftv'] + "," + val.id;
}
data['filts'][index]['strftv'] = strftv;
var valarr = ftv.split(",");
data['filts'][index]['ftv']=valarr;
}else {
data['filts'][index]['strftv'] = val.title; data['filts'][index]['strftv'] = val.title;
var arr = []; var arr = [];
arr.push(val.id); arr.push(val.id);
data['filts'][index]['ftv'] = arr; data['filts'][index]['ftv'] = arr;
}
X.laytpldata("#screen-con-box-dot",data['filts'],".screen-con-box",function(){ X.laytpldata("#screen-con-box-dot",data['filts'],".screen-con-box",function(){
renderdate(); renderdate();
}); });