|
@@ -711,18 +711,18 @@ function initialFilterHandler(){
|
|
else{
|
|
else{
|
|
text = x;
|
|
text = x;
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+ let str = (v + "#$$$#" + x)
|
|
//是否选中状态
|
|
//是否选中状态
|
|
let dataHtml;
|
|
let dataHtml;
|
|
- if((v + "#$$$#" + x) in vmap_uncheck){
|
|
|
|
- dataHtml = '<div class="textBox luckysheet-mousedown-cancel cf" data-check="false" data-filter="'+ (v + "#$$$#" + x) +'" title="'+ text +'">' +
|
|
|
|
|
|
+ if(str in vmap_uncheck){
|
|
|
|
+ dataHtml = '<div class="textBox luckysheet-mousedown-cancel cf" data-check="false" data-filter="'+ str.replace(/"/g,"&*&*").replace(/[\n\r]+/g,"") +'" title="'+ text.replace(/"/g,"&*&*") +'">' +
|
|
'<input class="luckysheet-mousedown-cancel" type="checkbox"/>' +
|
|
'<input class="luckysheet-mousedown-cancel" type="checkbox"/>' +
|
|
'<label class="luckysheet-mousedown-cancel">' + text + '</label>' +
|
|
'<label class="luckysheet-mousedown-cancel">' + text + '</label>' +
|
|
'<span class="luckysheet-mousedown-cancel count">( ' + vmap[v][x] + ' )</span>' +
|
|
'<span class="luckysheet-mousedown-cancel count">( ' + vmap[v][x] + ' )</span>' +
|
|
'</div>';
|
|
'</div>';
|
|
}
|
|
}
|
|
else{
|
|
else{
|
|
- dataHtml = '<div class="textBox luckysheet-mousedown-cancel cf" data-check="true" data-filter="'+ (v + "#$$$#" + x) +'" title="'+ text +'">' +
|
|
|
|
|
|
+ dataHtml = '<div class="textBox luckysheet-mousedown-cancel cf" data-check="true" data-filter="'+ str.replace(/"/g,"&*&*").replace(/[\n\r]+/g,"") +'" title="'+ text +'">' +
|
|
'<input class="luckysheet-mousedown-cancel" type="checkbox" checked="checked"/>' +
|
|
'<input class="luckysheet-mousedown-cancel" type="checkbox" checked="checked"/>' +
|
|
'<label class="luckysheet-mousedown-cancel">' + text + '</label>' +
|
|
'<label class="luckysheet-mousedown-cancel">' + text + '</label>' +
|
|
'<span class="luckysheet-mousedown-cancel count">( ' + vmap[v][x] + ' )</span>' +
|
|
'<span class="luckysheet-mousedown-cancel count">( ' + vmap[v][x] + ' )</span>' +
|
|
@@ -1722,7 +1722,7 @@ function initialFilterHandler(){
|
|
}
|
|
}
|
|
|
|
|
|
if($(e).closest(".textBox").length > 0){
|
|
if($(e).closest(".textBox").length > 0){
|
|
- let itemV = $(e).closest(".textBox").data("filter");
|
|
|
|
|
|
+ let itemV = $(e).closest(".textBox").data("filter").replace(/\&\*\&\*/g,'"').replace(/[\n\r]+/g,"");
|
|
|
|
|
|
filterdata[itemV] = "1";
|
|
filterdata[itemV] = "1";
|
|
}
|
|
}
|
|
@@ -1755,7 +1755,8 @@ function initialFilterHandler(){
|
|
else{
|
|
else{
|
|
value = cell.v + "#$$$#" + cell.m;
|
|
value = cell.v + "#$$$#" + cell.m;
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+ value = value.replace(/[\r\n]+/g,"")
|
|
|
|
+
|
|
if(value in filterdata){
|
|
if(value in filterdata){
|
|
rowhidden[r] = 0;
|
|
rowhidden[r] = 0;
|
|
}
|
|
}
|