Browse Source

jcl bug修复

yangbiao 9 years ago
parent
commit
aef22de656

+ 12 - 3
display-server/web/res/js/base/jcl.js

580
			str=str.replace(/\\\":(null|undefined)(,|})/g,"\\\":\\\"\\\"$2"); //处理KEY值里放IData或IDataset的toString串里的空值
580
			str=str.replace(/\\\":(null|undefined)(,|})/g,"\\\":\\\"\\\"$2"); //处理KEY值里放IData或IDataset的toString串里的空值
581
			str=str.replace(/\\\":(true|false)(,|})/g,"\\\":\\\"$1\\\"$2"); //处理KEY值里放IData或IDataset的toString串里的布尔值
581
			str=str.replace(/\\\":(true|false)(,|})/g,"\\\":\\\"$1\\\"$2"); //处理KEY值里放IData或IDataset的toString串里的布尔值
582
			str=str.replace(/\\\":(-)?([0-9\.]+)(,|})/g,"\\\":\\\"$1$2\\\"$3"); //处理KEY值里放IData或IDataset的toString串里的数值
582
			str=str.replace(/\\\":(-)?([0-9\.]+)(,|})/g,"\\\":\\\"$1$2\\\"$3"); //处理KEY值里放IData或IDataset的toString串里的数值
583
			str=str.replace(/\\\"/g,"!~b~!"); //把字符串中原有的 \" 替换,处理KEY值里放IData或IDataset的toString串的情况
583
			//ybf326
584
			//str=str.replace(/\\\"/g,"!~b~!"); //把字符串中原有的 \" 替换,处理KEY值里放IData或IDataset的toString串的情况
584
			
585
			
585
			str=str.replace(/:(null|undefined)(,|})/g,":\"\"$2");    //将null或undefined替换为空字符
586
			str=str.replace(/:(null|undefined)(,|})/g,":\"\"$2");    //将null或undefined替换为空字符
586
			str=str.replace(/:(true|false)(,|})/g,":\"$1\"$2");      //将true|false替换为字符串
587
			str=str.replace(/:(true|false)(,|})/g,":\"$1\"$2");      //将true|false替换为字符串
617
					case "\n":
618
					case "\n":
618
						out +="\u005Cn";
619
						out +="\u005Cn";
619
						break;
620
						break;
620
					case "\"":
621
					//ybf326
622
					/*case "\"":
621
						out +="!~a~!";
623
						out +="!~a~!";
622
						break;
624
						break;*/
623
					default:
625
					default:
624
						out += chr;
626
						out += chr;
625
					break;
627
					break;
627
			}
629
			}
628
			str = out;
630
			str = out;
629
		
631
		
632
			//ybf326
633
			/*
630
			//第一次替换处理JSON格式的双引号字符
634
			//第一次替换处理JSON格式的双引号字符
631
			str=str.replace(/{!~a~!/g,"{\""); //处理 {"
635
			str=str.replace(/{!~a~!/g,"{\""); //处理 {"
632
			str=str.replace(/!~a~!}/g,"\"}");  //处理 "}
636
			str=str.replace(/!~a~!}/g,"\"}");  //处理 "}
641
			str=str.replace(/\u005C!~a~!/g,"\u005C\""); //本身就有\的还原
645
			str=str.replace(/\u005C!~a~!/g,"\u005C\""); //本身就有\的还原
642
			str=str.replace(/!~a~!/g,"\u005C\"");    //其它的加上\符号
646
			str=str.replace(/!~a~!/g,"\u005C\"");    //其它的加上\符号
643
			str=str.replace(/!~b~!/g,"\u005C\"");   //恢复 !~b~! 为 \"
647
			str=str.replace(/!~b~!/g,"\u005C\"");   //恢复 !~b~! 为 \"
648
			*/
644
			
649
			
645
			//str=str.replace(/\r/g,"\u005Cr");		
650
			//str=str.replace(/\r/g,"\u005Cr");		
646
			//str=str.replace(/\n/g,"\u005Cn");	
651
			//str=str.replace(/\n/g,"\u005Cn");	
678
					case "\"":
683
					case "\"":
679
						out +="\u005C\"";
684
						out +="\u005C\"";
680
						break;
685
						break;
686
					//ybf326
687
					case "\\":
688
						out += "\u005C\u005C";
689
						break;
681
					default:
690
					default:
682
						out += chr;
691
						out += chr;
683
					break;
692
					break;

+ 12 - 5
ipu-server/web/res/js/base/jcl.js

580
			str=str.replace(/\\\":(null|undefined)(,|})/g,"\\\":\\\"\\\"$2"); //处理KEY值里放IData或IDataset的toString串里的空值
580
			str=str.replace(/\\\":(null|undefined)(,|})/g,"\\\":\\\"\\\"$2"); //处理KEY值里放IData或IDataset的toString串里的空值
581
			str=str.replace(/\\\":(true|false)(,|})/g,"\\\":\\\"$1\\\"$2"); //处理KEY值里放IData或IDataset的toString串里的布尔值
581
			str=str.replace(/\\\":(true|false)(,|})/g,"\\\":\\\"$1\\\"$2"); //处理KEY值里放IData或IDataset的toString串里的布尔值
582
			str=str.replace(/\\\":(-)?([0-9\.]+)(,|})/g,"\\\":\\\"$1$2\\\"$3"); //处理KEY值里放IData或IDataset的toString串里的数值
582
			str=str.replace(/\\\":(-)?([0-9\.]+)(,|})/g,"\\\":\\\"$1$2\\\"$3"); //处理KEY值里放IData或IDataset的toString串里的数值
583
			str=str.replace(/\\\"/g,"!~b~!"); //把字符串中原有的 \" 替换,处理KEY值里放IData或IDataset的toString串的情况
583
			//ybf326
584
			//str=str.replace(/\\\"/g,"!~b~!"); //把字符串中原有的 \" 替换,处理KEY值里放IData或IDataset的toString串的情况
584
			
585
			
585
			str=str.replace(/:(null|undefined)(,|})/g,":\"\"$2");    //将null或undefined替换为空字符
586
			str=str.replace(/:(null|undefined)(,|})/g,":\"\"$2");    //将null或undefined替换为空字符
586
			str=str.replace(/:(true|false)(,|})/g,":\"$1\"$2");      //将true|false替换为字符串
587
			str=str.replace(/:(true|false)(,|})/g,":\"$1\"$2");      //将true|false替换为字符串
617
					case "\n":
618
					case "\n":
618
						out +="\u005Cn";
619
						out +="\u005Cn";
619
						break;
620
						break;
620
					case "\"":
621
					//ybf326
622
					/*case "\"":
621
						out +="!~a~!";
623
						out +="!~a~!";
622
						break;
624
						break;*/
623
					default:
625
					default:
624
						out += chr;
626
						out += chr;
625
					break;
627
					break;
627
			}
629
			}
628
			str = out;
630
			str = out;
629
		
631
		
632
			//ybf326
633
			/*
630
			//第一次替换处理JSON格式的双引号字符
634
			//第一次替换处理JSON格式的双引号字符
631
			str=str.replace(/{!~a~!/g,"{\""); //处理 {"
635
			str=str.replace(/{!~a~!/g,"{\""); //处理 {"
632
			str=str.replace(/!~a~!}/g,"\"}");  //处理 "}
636
			str=str.replace(/!~a~!}/g,"\"}");  //处理 "}
633
			str=str.replace(/!~a~!,!~a~!/g,"\",\"");   //处理 ","
637
			str=str.replace(/!~a~!,!~a~!/g,"\",\"");   //处理 ","
634
			str=str.replace(/!~a~!:!~a~!/g,"\":\"");   //处理 ":"
638
			str=str.replace(/!~a~!:!~a~!/g,"\":\"");   //处理 ":"
635
			str=str.replace(/!~a~!:\[!~a~!/g,"\":[\"");   //处理 ":["
636
			str=str.replace(/!~a~!:\[/g,"\":[");   //处理 ":[
639
			str=str.replace(/!~a~!:\[/g,"\":[");   //处理 ":[
637
			str=str.replace(/!~a~!\],!~a~!/g,"\"],\"");   //处理 "],"
638
			str=str.replace(/\],!~a~!/g,"],\"");   //处理 ],"
640
			str=str.replace(/\],!~a~!/g,"],\"");   //处理 ],"
639
			str=str.replace(/!~a~!:{/g,"\":{");    //处理 ":{
641
			str=str.replace(/!~a~!:{/g,"\":{");    //处理 ":{
640
			str=str.replace(/},!~a~!/g,"},\"");    //处理 },"
642
			str=str.replace(/},!~a~!/g,"},\"");    //处理 },"
643
			str=str.replace(/\u005C!~a~!/g,"\u005C\""); //本身就有\的还原
645
			str=str.replace(/\u005C!~a~!/g,"\u005C\""); //本身就有\的还原
644
			str=str.replace(/!~a~!/g,"\u005C\"");    //其它的加上\符号
646
			str=str.replace(/!~a~!/g,"\u005C\"");    //其它的加上\符号
645
			str=str.replace(/!~b~!/g,"\u005C\"");   //恢复 !~b~! 为 \"
647
			str=str.replace(/!~b~!/g,"\u005C\"");   //恢复 !~b~! 为 \"
648
			*/
646
			
649
			
647
			//str=str.replace(/\r/g,"\u005Cr");		
650
			//str=str.replace(/\r/g,"\u005Cr");		
648
			//str=str.replace(/\n/g,"\u005Cn");	
651
			//str=str.replace(/\n/g,"\u005Cn");	
680
					case "\"":
683
					case "\"":
681
						out +="\u005C\"";
684
						out +="\u005C\"";
682
						break;
685
						break;
686
					//ybf326
687
					case "\\":
688
						out += "\u005C\u005C";
689
						break;
683
					default:
690
					default:
684
						out += chr;
691
						out += chr;
685
					break;
692
					break;

BIN
wade-mobile-push-yunba/libs/android-support-v4.jar