diff --git a/convertxml/js_convertxml.cpp b/convertxml/js_convertxml.cpp index 351c53a..ed42fa6 100755 --- a/convertxml/js_convertxml.cpp +++ b/convertxml/js_convertxml.cpp @@ -313,6 +313,7 @@ namespace OHOS::Xml { Replace(strXml, "\\r", "\r"); Replace(strXml, "\\n", "\n"); Replace(strXml, "\\v", "\v"); + Replace(strXml, "\\t", "\t"); Replace(strXml, "]]> ', idxSec)) != -1) { + while ((idx = strXml.indexOf('>', idxSec)) !== -1) { idxThir = strXml.indexOf('<', idx); strXml = DealPriorReplace(strXml, idx, idxThir); - if (strXml.indexOf('<', idx) != -1) { + if (strXml.indexOf('<', idx) !== -1) { idxCData = strXml.indexOf('', idxCData); strXml = DealLaterReplace(strXml, idx, idxThir); idxCDataSec = idxSec; @@ -72,20 +74,20 @@ function DealXml(strXml : string) return strXml; } -function DealPriorReplace(strXml : string, idx : any, idxThir : any) +function DealPriorReplace(strXml : string, idx : number, idxThir : number) { - var i = idx + 1; + let i : number = idx + 1; for (; i < idxThir ; i++) { - var cXml = strXml.charAt(i); - if (cXml != '\n' && cXml != '\v' && cXml != '\t' && cXml != ' ') + let cXml : string = strXml.charAt(i); + if (cXml !== '\n' && cXml !== '\v' && cXml !== '\t' && cXml !== ' ') { break; } } - var j = idx + 1; + let j : number = idx + 1; for (; j < strXml.indexOf('<', idx) ; j++) { - var cXml = strXml.charAt(j); - if (i != idxThir) { + let cXml : string = strXml.charAt(j); + if (i !== idxThir) { switch (cXml) { case '\n': strXml = strXml.substring(0, j) + '\\n' + strXml.substring(j + 1); @@ -107,11 +109,11 @@ function DealPriorReplace(strXml : string, idx : any, idxThir : any) return strXml; } -function DealLaterReplace(strXml : string, idx : any, idxThir : any) +function DealLaterReplace(strXml : string, idx : number, idxThir : number) { - var i = idx + 1; + let i : number = idx + 1; for (; i < idxThir ; i++) { - var cXml = strXml.charAt(i) + let cXml : string = strXml.charAt(i) switch (cXml) { case '\n': strXml = strXml.substring(0, i) + '\\n' + strXml.substring(i + 1); @@ -129,4 +131,6 @@ function DealLaterReplace(strXml : string, idx : any, idxThir : any) return strXml; } -export default ConvertXML \ No newline at end of file +export default { + ConvertXML : ConvertXML +} \ No newline at end of file