diff --git a/laws-modules/src/main/java/com/jero/modules/compare/utils/DiffUtils.java b/laws-modules/src/main/java/com/jero/modules/compare/utils/DiffUtils.java index 92bb4365..7b2c8c84 100644 --- a/laws-modules/src/main/java/com/jero/modules/compare/utils/DiffUtils.java +++ b/laws-modules/src/main/java/com/jero/modules/compare/utils/DiffUtils.java @@ -2268,10 +2268,22 @@ public class DiffUtils { // .replace(">", ">").replace("\n", "
"); switch (deff.operation) { case INSERT: - RResultStr+=""+text+""; + 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+=""+text+""; + } break; case DELETE://删除 说明是左边有变化 右边没有变化 - LResultStr+=""+text+""; + 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+=""+text+""; + } break; case EQUAL: LResultStr+=text; @@ -2303,7 +2315,51 @@ public class DiffUtils { .replace("r>", "
") .replace("r>", "
") .replace("replaceImg", "
replaceImg") - .replace("replaceImg", "replaceImg"); + .replace("replaceImg", "replaceImg") + + .replace("2\" c" + + "olspan= " + + "\"1\"", "") + .replace("2\" c" + + "olspan= " + + "\"1\"", "") + .replace("\"2\" c" + + "olspan= \"" + + "1\"", "") + .replace("\"2\" c" + + "olspan= \"" + + "1\"", "") + .replace("rowsp" + + "an= \"2\" " + + "colspan= " + + "\"1\"", "") + .replace("rowsp" + + "an= \"2\" " + + "colspan= " + + "\"1\"", "") + .replace(" >", " ") + .replace(" >", " ") + .replace("tyle", " rowspan=\"" + + "2\">", "rowspan=\"2\">") + .replace(" rowspan=\"" + + "2\">", "rowspan=\"2\">") + .replace("\" border: 1px " + + "solid; \" rowspan=\"2\">>", + "
") + .replace("\"
border: 1px " + + "solid; \" rowspan=\"2\">>", + "
") + .replace("rder: 1
px" + + " solid; \" rowspan=\"2\">" + , "") + .replace("rder: 1px" + + " solid; \" rowspan=\"2\">" + , ""); } private String updataErrorDiff2(String str) {