From 2d2b6d263d5f761a973109326eeb64ca50e3cfb4 Mon Sep 17 00:00:00 2001 From: luosongbai <15272473386@163.com> Date: Mon, 22 Nov 2021 19:40:30 +0800 Subject: [PATCH] 1 --- web/pages/analysis.html | 12 ++-- web/pages/screen.html | 2 +- web/src/x.min.js | 121 ++++++++++++++++++++++----------- web/srczip/logic/analysis.js | 45 ++++++++---- web/srczip/logic/modeltable.js | 51 +++++++------- web/srczip/logic/screen.js | 25 +++++-- 6 files changed, 167 insertions(+), 89 deletions(-) diff --git a/web/pages/analysis.html b/web/pages/analysis.html index 31053d3..7727b5c 100644 --- a/web/pages/analysis.html +++ b/web/pages/analysis.html @@ -282,8 +282,8 @@
{{items.comparator_name}}
{{# if(items.tableType != "user_label"){ }} -
- +
+
{{# } }} @@ -339,7 +339,7 @@
{{items.columnDesc}}
{{items.comparator_name}}
-
+
@@ -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.data_type != "datetime" && item.data_type != "user_label"){ }} -
- +
+
{{# } else if(item.data_type == "user_label"){ }} {{# } else { }} -
+
{{item.ftv}}
{{# } }} diff --git a/web/pages/screen.html b/web/pages/screen.html index 809ffd4..8df123e 100644 --- a/web/pages/screen.html +++ b/web/pages/screen.html @@ -40,7 +40,7 @@
{{# if(item.comparator != "is null" && item.comparator != "is not null" && item.comparator !="not null" && item.comparator != "range"){ }} {{# if(item.data_type != "datetime"){ }} -
+
{{# } else { }} diff --git a/web/src/x.min.js b/web/src/x.min.js index e6eca12..5d62312 100644 --- a/web/src/x.min.js +++ b/web/src/x.min.js @@ -3778,6 +3778,7 @@ var X = window.X || { var offset = obj.offset(); var index = $(this).attr("data-index"); var indexs = $(this).attr("data-indexs"); + var comparator = obj.attr("data-comparator"); var columnName; if(indexs != undefined){ 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 offset = obj.offset(); 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){ - console.log(val); if(val != "查无数据"){ - X.parametersopen(val['map_'],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){ - - data['eventView']['filts'][index]['strftv'] = val.title; - var arr = []; - arr.push(val.id); - data['eventView']['filts'][index]['ftv'] = arr; + + 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; + var arr = []; + arr.push(val.id); + data['eventView']['filts'][index]['ftv'] = arr; + } + X.laytpldata("#analysis-overall-situation-list-box-dot",data['eventView']['filts'],".analysis-overall-situation-list-box",function(){ 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 val = $(this).val(); - var valarr = val.split(","); - data['eventView']['filts'][index]['ftv']=valarr; - data['eventView']['filts'][index]['strftv']=val; + var comparator = $(this).attr("data-comparator"); + if(comparator != 'in'){ + var val = $(this).val(); + if(val != ""){ + var valarr = val.split(","); + data['eventView']['filts'][index]['ftv']=valarr; + data['eventView']['filts'][index]['strftv']=val; + } + } }); $(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; var data = parms; 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"){ @@ -10323,31 +10339,37 @@ var X = window.X || { // } // newcondata.push(condataArr); // } - // }else if(data.cat == "retention" || data.cat == "scatter"){ - // console.log(oldcondata); - // }else if(data.cat == "user_property"){ - // } - // var headdata = []; - // for(let i in data.titledata){ - // var arr = { - // width: 150, - // title: data.titledata[i], - // name: 'name'+i, - // align: 'center' - // }; - // if(i == 0){ - // arr['fixed'] = true; + // var headdata = []; + // for(let i in data.titledata){ + // var arr = { + // width: 150, + // title: data.titledata[i], + // name: 'name'+i, + // align: 'center' + // }; + // if(i == 0){ + // arr['fixed'] = true; + // } + // headdata.push(arr); // } - // headdata.push(arr); - // } + + // $("#table-tbody-box-"+data.id).mmGrid({ + // cols: headdata, + // items: newcondata, + // fullWidthRows: true + // }); + // X.fixedTable("table-tbody-box-"+data.id,'row-col-fixed','',headdata,data.condata,data.cat); - // $("#table-tbody-box-"+data.id).mmGrid({ - // cols: headdata, - // items: newcondata, - // fullWidthRows: true - // }); - // // 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'); X.parametersopen(filter_map[type],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){ + // console.log(val); obj.html(val.title); data['filts'][index]['comparator_name'] = val.title; data['filts'][index]['comparator'] = val.id; @@ -12996,15 +13019,31 @@ var X = window.X || { $(document).off("click",'.right-box').on("click",'.right-box',function(){ var obj = $(this); var index = obj.attr("data-index"); + var comparator = obj.attr("data-comparator"); var offset = obj.offset(); var columnName = data['filts'][index]['columnName']; X.api("data_mana/select_attr","post",{attr_name:columnName},function(val){ if(val != "查无数据"){ X.parametersopen(val['map_'],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){ - data['filts'][index]['strftv'] = val.title; - var arr = []; - arr.push(val.id); - data['filts'][index]['ftv'] = arr; + 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; + var arr = []; + arr.push(val.id); + data['filts'][index]['ftv'] = arr; + } + + X.laytpldata("#screen-con-box-dot",data['filts'],".screen-con-box",function(){ renderdate(); }); diff --git a/web/srczip/logic/analysis.js b/web/srczip/logic/analysis.js index d2e5f4c..d3349a7 100644 --- a/web/srczip/logic/analysis.js +++ b/web/srczip/logic/analysis.js @@ -391,6 +391,7 @@ var offset = obj.offset(); var index = $(this).attr("data-index"); var indexs = $(this).attr("data-indexs"); + var comparator = obj.attr("data-comparator"); var columnName; if(indexs != undefined){ 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 offset = obj.offset(); 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){ - console.log(val); if(val != "查无数据"){ - X.parametersopen(val['map_'],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){ - - data['eventView']['filts'][index]['strftv'] = val.title; - var arr = []; - arr.push(val.id); - data['eventView']['filts'][index]['ftv'] = arr; + + 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; + var arr = []; + arr.push(val.id); + data['eventView']['filts'][index]['ftv'] = arr; + } + X.laytpldata("#analysis-overall-situation-list-box-dot",data['eventView']['filts'],".analysis-overall-situation-list-box",function(){ 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 val = $(this).val(); - var valarr = val.split(","); - data['eventView']['filts'][index]['ftv']=valarr; - data['eventView']['filts'][index]['strftv']=val; + var comparator = $(this).attr("data-comparator"); + if(comparator != 'in'){ + var val = $(this).val(); + if(val != ""){ + var valarr = val.split(","); + data['eventView']['filts'][index]['ftv']=valarr; + data['eventView']['filts'][index]['strftv']=val; + } + } }); $(document).off('blur','.analysis-overall-situation-input2 input').on('blur','.analysis-overall-situation-input2 input',function(){ diff --git a/web/srczip/logic/modeltable.js b/web/srczip/logic/modeltable.js index 20fe71e..ee09a41 100644 --- a/web/srczip/logic/modeltable.js +++ b/web/srczip/logic/modeltable.js @@ -6,7 +6,6 @@ this.callback = parms.callback; var data = parms; 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"){ @@ -20,31 +19,37 @@ // } // newcondata.push(condataArr); // } - // }else if(data.cat == "retention" || data.cat == "scatter"){ - // console.log(oldcondata); - // }else if(data.cat == "user_property"){ - // } - // var headdata = []; - // for(let i in data.titledata){ - // var arr = { - // width: 150, - // title: data.titledata[i], - // name: 'name'+i, - // align: 'center' - // }; - // if(i == 0){ - // arr['fixed'] = true; + // var headdata = []; + // for(let i in data.titledata){ + // var arr = { + // width: 150, + // title: data.titledata[i], + // name: 'name'+i, + // align: 'center' + // }; + // if(i == 0){ + // arr['fixed'] = true; + // } + // headdata.push(arr); // } - // headdata.push(arr); - // } + + // $("#table-tbody-box-"+data.id).mmGrid({ + // cols: headdata, + // items: newcondata, + // fullWidthRows: true + // }); + // X.fixedTable("table-tbody-box-"+data.id,'row-col-fixed','',headdata,data.condata,data.cat); - // $("#table-tbody-box-"+data.id).mmGrid({ - // cols: headdata, - // items: newcondata, - // fullWidthRows: true - // }); - // // 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); // } }) diff --git a/web/srczip/logic/screen.js b/web/srczip/logic/screen.js index fc035a4..5213b50 100644 --- a/web/srczip/logic/screen.js +++ b/web/srczip/logic/screen.js @@ -135,6 +135,7 @@ var type =obj.attr('data-type'); X.parametersopen(filter_map[type],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){ + // console.log(val); obj.html(val.title); data['filts'][index]['comparator_name'] = val.title; data['filts'][index]['comparator'] = val.id; @@ -150,15 +151,31 @@ $(document).off("click",'.right-box').on("click",'.right-box',function(){ var obj = $(this); var index = obj.attr("data-index"); + var comparator = obj.attr("data-comparator"); var offset = obj.offset(); var columnName = data['filts'][index]['columnName']; X.api("data_mana/select_attr","post",{attr_name:columnName},function(val){ if(val != "查无数据"){ X.parametersopen(val['map_'],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){ - data['filts'][index]['strftv'] = val.title; - var arr = []; - arr.push(val.id); - data['filts'][index]['ftv'] = arr; + 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; + var arr = []; + arr.push(val.id); + data['filts'][index]['ftv'] = arr; + } + + X.laytpldata("#screen-con-box-dot",data['filts'],".screen-con-box",function(){ renderdate(); });