QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(88832): 标准比对--文档比对--点击后有代码

Browse Source
This commit is contained in:
yjz
2024-08-20 16:20:48 +08:00
parent 1ee45229b2
commit 867d37a3a5
1 changed files with 59 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/compare/utils/DiffUtils.java
+59 -3
View File
@@ -2268,10 +2268,22 @@ public class DiffUtils {
// .replace(">", "&gt;").replace("\n", "<br/>");
switch (deff.operation) {
case INSERT:
RResultStr+="<span class=\"insertClass\">"+text+"</span>";
if (text.startsWith("border=\"") || text.startsWith("width:") || text.startsWith("row") || text.startsWith("pan") ||
RResultStr.endsWith("\"border-collapse:") || text.contains("border: 1px")
|| text.endsWith("style=\" b") || text.endsWith("style=\"text-align: center;\"")){
RResultStr+=text;
}else {
RResultStr+="<span class=\"insertClass\">"+text+"</span>";
}
break;
case DELETE://删除 说明是左边有变化 右边没有变化
LResultStr+="<span class=\"delClass\">"+text+"</span>";
if (text.startsWith("border=\"") || text.startsWith("width:") || text.startsWith("row") || text.startsWith("pan") ||
LResultStr.endsWith("\"border-collapse:") || text.contains("border: 1px")
|| text.endsWith("style=\" b") || text.endsWith("style=\"text-align: center;\"")){
LResultStr+=text;
}else {
LResultStr+="<span class=\"delClass\">"+text+"</span>";
}
break;
case EQUAL:
LResultStr+=text;
@@ -2303,7 +2315,51 @@ public class DiffUtils {
.replace("<b</span>r<span class=\"delClass\">>", "<br></span><span class=\"delClass\">")
.replace("<b</span>r<span class=\"insertClass\">>", "<br></span><span class=\"insertClass\">")
.replace("replaceI</span>m<span class=\"delClass\">g</span>", "</span>replaceImg")
.replace("replaceI</span>m<span class=\"insertClass\">g</span>", "</span>replaceImg");
.replace("replaceI</span>m<span class=\"insertClass\">g</span>", "</span>replaceImg")
.replace("<td rowspan= \"<span class=\"delClass\">2\"</span> <span class=\"delClass\">c" +
"</span>o<span class=\"delClass\">l</span>span=<span class=\"delClass\"> " +
"</span>\"<span class=\"delClass\">1</span>\"", "<td rowspan=\"2\" colspan=\"1\">")
.replace("<td rowspan= \"<span class=\"insertClass\">2\"</span> <span class=\"insertClass\">c" +
"</span>o<span class=\"insertClass\">l</span>span=<span class=\"insertClass\"> " +
"</span>\"<span class=\"insertClass\">1</span>\"", "<td rowspan=\"2\" colspan=\"1\">")
.replace("<td rowspan= <span class=\"delClass\">\"2\"</span> <span class=\"delClass\">c" +
"</span>olspan=<span class=\"delClass\"> </span>\"<span class=\"delClass\">" +
"1</span>\"", "<td rowspan=\"2\" colspan=\"1\">")
.replace("<td rowspan= <span class=\"insertClass\">\"2\"</span> <span class=\"insertClass\">c" +
"</span>olspan=<span class=\"insertClass\"> </span>\"<span class=\"insertClass\">" +
"1</span>\"", "<td rowspan=\"2\" colspan=\"1\">")
.replace("<td <span class=\"delClass\">r</span>o<span class=\"delClass\">ws</span>p" +
"<span class=\"delClass\">an=</span> \"<span class=\"delClass\">2\"</span> " +
"<span class=\"delClass\">c</span>o<span class=\"delClass\">l</span>span=<span class=\"delClass\"> " +
"</span>\"<span class=\"delClass\">1</span>\"", "<td rowspan=\"2\" colspan=\"1\">")
.replace("<td <span class=\"insertClass\">r</span>o<span class=\"insertClass\">ws</span>p" +
"<span class=\"insertClass\">an=</span> \"<span class=\"insertClass\">2\"</span> " +
"<span class=\"insertClass\">c</span>o<span class=\"insertClass\">l</span>span=<span class=\"insertClass\"> " +
"</span>\"<span class=\"insertClass\">1</span>\"", "<td rowspan=\"2\" colspan=\"1\">")
.replace("<span class=\"delClass\"> </span>>", "<span class=\"delClass\"> </span>")
.replace("<span class=\"insertClass\"> </span>>", "<span class=\"insertClass\"> </span>")
.replace("<td s<span class=\"insertClass\">tyle</span>", "<td style")
.replace("<span class=\"delClass\"> r</span>o<span class=\"delClass\">w</span>span=\"" +
"<span class=\"delClass\">2</span>\">", "rowspan=\"2\">")
.replace("<span class=\"insertClass\"> r</span>o<span class=\"insertClass\">w</span>span=\"" +
"<span class=\"insertClass\">2</span>\">", "rowspan=\"2\">")
.replace("<td style=<span class=\"delClass\">\"</span> border: 1px <span class=\"delClass\">" +
"s</span>ol<span class=\"delClass\">id; \" row</span>span=\"<span class=\"delClass\"" +
">2</span>\"<span class=\"delClass\">><br</span>>",
"<td style=\" border: 1px solid; \" rowspan=\"2\"><br>")
.replace("<td style=<span class=\"insertClass\">\"</span> border: 1px <span class=\"insertClass\">" +
"s</span>ol<span class=\"insertClass\">id; \" row</span>span=\"<span class=\"insertClass\"" +
">2</span>\"<span class=\"insertClass\">><br</span>>",
"<td style=\" border: 1px solid; \" rowspan=\"2\"><br>")
.replace("<td style=\" bo<span class=\"delClass\">rder: 1</span>p<span class=\"delClass\">x" +
" solid;</span> \"<span class=\"delClass\"> </span> <span class=\"delClass\">r</span" +
">o<span class=\"delClass\">w</span>span=\"<span class=\"delClass\">2</span>\">"
, "<td style=\" border: 1px solid; \" rowspan=\"2\">")
.replace("<td style=\" bo<span class=\"insertClass\">rder: 1</span>p<span class=\"insertClass\">x" +
" solid;</span> \"<span class=\"insertClass\"> </span> <span class=\"insertClass\">r</span" +
">o<span class=\"insertClass\">w</span>span=\"<span class=\"insertClass\">2</span>\">"
, "<td style=\" border: 1px solid; \" rowspan=\"2\">");
}
private String updataErrorDiff2(String str) {